Backport "Traverse annotations instead of just registering, fixes #16877" #17269
+19
−10
We went looking everywhere, but couldn’t find those commits.
Sometimes commits can disappear after a force-push. Head back to the latest changes here.